Re-enable libostree/test-concurrency.py.test, but mark it as flaky

See #901170.

diff --git a/debian/tests/control b/debian/tests/control
index 0494c239690cbacc8fd3f4f4295f248d63146db6..28691e703163a2d5db4bef9c31e90a53c025777f 100644 (file)
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,7 @@
+Tests: flaky
+Restrictions: flaky
+Depends: gnome-desktop-testing, ostree-tests
+
 Tests: gnome-desktop-testing
 Depends: gnome-desktop-testing, ostree-tests
 

diff --git a/debian/tests/flaky b/debian/tests/flaky
new file mode 100644 (file)
index 0000000..09e64cc
--- /dev/null
+++ b/debian/tests/flaky
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+exec 2>&1
+
+# Ubuntu provides internet access via a proxy, but libostree doesn't need
+# that. However, libostree also doesn't support no_proxy, so it will try
+# to use Ubuntu's proxy for localhost, and fail to reach itself.
+unset ftp_proxy
+unset http_proxy
+unset https_proxy
+unset no_proxy
+
+exec gnome-desktop-testing-runner libostree/test-concurrency.py.test